merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Fri, 15 Jun 2007 19:33:11 +0000 (13:33 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Fri, 15 Jun 2007 19:33:11 +0000 (13:33 -0600)
commitb51cbb0e1244018e05fc6c1a28eb7539e1e3bbea
treedae6f656f612685d1c528cb0b6a13badbd6370d8
parent2d869d45e5c9969ee47d2f3d2cd127e5ff995685
parentb010d6c68edcd9a057310240a97de6186db12437
merge with xen-unstable.hg